0d8bb835ba4e025610583b4b035ae48a8692dc36,Paintroid/src/main/java/org/catrobat/paintroid/dialog/LayersDialog.java,LayersDialog,deleteLayer,#,280
Before Change
if(currentLayer != null) {
mLayerButtonAdapter.removeLayer(currentLayer.getLayerID());
refreshView();
}
selectLayer(mLayerButtonAdapter.getLayer(new_position));
After Change
public void deleteLayer() {
int layerCount = mLayerButtonAdapter.getCount();
if (layerCount == 1 || mCurrentLayer == null) {
return;
}
int currentPosition = mLayerButtonAdapter.getPosition(mCurrentLayer.getLayerID());
int newPosition = currentPosition;
if (currentPosition == layerCount - 1 && layerCount > 1) {
newPosition = currentPosition - 1;
}
mLayerButtonAdapter.removeLayer(mCurrentLayer);
PaintroidApplication.commandManager.commitRemoveLayerCommand(new LayerCommand(mCurrentLayer));
selectLayer(mLayerButtonAdapter.getLayer(newPosition));
if (mLayerButtonAdapter.checkAllLayerVisible())
Toast.makeText(PaintroidApplication.applicationContext, R.string.layer_invisible, Toast.LENGTH_LONG).show();
refreshView();
}
public void selectLayer(Layer toSelect) {